merge trunk
authorKenichi Handa <handa@etlken>
Mon, 10 May 2010 03:37:03 +0000 (12:37 +0900)
committerKenichi Handa <handa@etlken>
Mon, 10 May 2010 03:37:03 +0000 (12:37 +0900)

Trivial merge